merge trunk
authorKenichi Handa <handa@gnu.org>
Fri, 14 Sep 2012 11:32:32 +0000 (20:32 +0900)
committerKenichi Handa <handa@gnu.org>
Fri, 14 Sep 2012 11:32:32 +0000 (20:32 +0900)

Trivial merge